x86: Avoid dynamic memory allocation during AP startup.
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 21 Oct 2008 10:39:22 +0000 (11:39 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 21 Oct 2008 10:39:22 +0000 (11:39 +0100)
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen/arch/x86/smpboot.c

index 69218fd322ad5e90514cb7a336efaff4021f6b83..d7360ec29c8e6922e971de987d2ed58adaf5d582 100644 (file)
@@ -473,13 +473,6 @@ static void construct_percpu_idt(unsigned int cpu)
 {
        unsigned char idt_load[10];
 
-       /* If IDT table exists since last hotplug, reuse it */
-       if (!idt_tables[cpu]) {
-               idt_tables[cpu] = xmalloc_array(idt_entry_t, IDT_ENTRIES);
-               memcpy(idt_tables[cpu], idt_table,
-                               IDT_ENTRIES*sizeof(idt_entry_t));
-       }
-
        *(unsigned short *)(&idt_load[0]) = (IDT_ENTRIES*sizeof(idt_entry_t))-1;
        *(unsigned long  *)(&idt_load[2]) = (unsigned long)idt_tables[cpu];
        __asm__ __volatile__ ( "lidt %0" : "=m" (idt_load) );
@@ -908,6 +901,12 @@ static int __devinit do_boot_cpu(int apicid, int cpu)
        }
 #endif
 
+       if (!idt_tables[cpu]) {
+               idt_tables[cpu] = xmalloc_array(idt_entry_t, IDT_ENTRIES);
+               memcpy(idt_tables[cpu], idt_table,
+                      IDT_ENTRIES*sizeof(idt_entry_t));
+       }
+
        /*
         * This grunge runs the startup process for
         * the targeted processor.